Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y

diff --cc drivers/gpu/drm/vc4/vc4_v3d.c
index 0b8ac3c0c48a744f28406913b140dc786fa5beca,ce7c21d250cf9ed99d0b1eaa401e91629c459e0f..5b1d4f8e0432e13ccd679ea72f4d0e54a67bbd74
--- 1/drivers/gpu/drm/vc4/vc4_v3d.c
--- 2/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@@ -314,13 -171,11 +314,16 @@@ static int vc4_v3d_runtime_resume(struc
  {
        struct vc4_v3d *v3d = dev_get_drvdata(dev);
        struct vc4_dev *vc4 = v3d->vc4;
 +      int ret;
 +
 +      ret = vc4_allocate_bin_bo(vc4->dev);
 +      if (ret)
 +              return ret;
  
        vc4_v3d_init_hw(vc4->dev);
+ 
+       /* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */
+       enable_irq(vc4->dev->irq);
        vc4_irq_postinstall(vc4->dev);
  
        return 0;